Android: Misc Changes