Android Changes and bug fixes

Android Changes and bug fixes