Merge from AOSP

Change-Id: Idf8f3e3a4c86e31921ed6e3a7d2662964512b3d8