Merge from AOSP

Change-Id: I83f2ba38dca0fa86e9ff802e5df02311f6bc6e99