Merge from AOSP

Change-Id: I6a85121a3c33e88bac711b1cfa8148f78473a390