Merge from AOSP

Change-Id: Iae692bc1c54ffc241fd6853bbbdab19688c4f46b