Fixed the Android unit test failures

[prashantvc]

Fixed the unit test failurs

PR Checklist

• [X] Has tests (if omitted, state reason in description)
• [X] Rebased on top of master at time of PR
• [X] Consolidate commits as makes sense

[prashantvc]

It's strange Github including old commit in the PR. Anyway the new commits starts from 6224dc9

[prashantvc]

Fixed the review findings, reverted CrossSettings.cs file back to commit cb2fe5e