Merge: Android support improvements