Adding changes for Android SDK Release 2.3.0