Merge "Merge "Android 1<3." into tm-dev am: 0f8269e68e am: 24650a74b5" into tm-d1-dev-plus-aosp