Merge: Minor fixes to the Android support