Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo