Merge from AOSP

Change-Id: Ia0b662245ccc4552e8d552939120f1da2fe83243