Merge "Merge "Android 1<3." into tm-dev am: 0f8269e68e am: a95ab05e3a am: dfd5682403" into tm-qpr-dev-plus-aosp