Fix whitespace
Merge pull request #2 from walmartlabs/android-replace-fix

Android replace fix
Merge branch 'master' into pending-nav-fix