Updates for Android SDK