Merge from AOSP

Change-Id: Iac208f0eb00068132c31092ec55cf1a147ebfc89