Merge from AOSP

Change-Id: Ibca2e9f36bbc8867dec0e2e06624456d51b17e73