Merge from AOSP

Change-Id: I885abca951326c884d6e64536ebaa3da0220d461