Merge "Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"