am e40e5c0b: do not merge Bringing change https://android-git.corp.google.com/g/#change,30376 into Eclair branch

Merge commit 'e40e5c0b4e93bea088edae29000a1b946fad8310' into eclair-plus-aosp

* commit 'e40e5c0b4e93bea088edae29000a1b946fad8310':
  do not merge Bringing change https://android-git.corp.google.com/g/#change,30376 into Eclair branch