Merge from AOSP

Change-Id: Ic2651c490850fffa1efb2db9c51e0a45a4c02f7a