Merge from AOSP

Change-Id: If2e8e4305d10df738cc4ebcf226077f273a48cbf