am 4d69ac66: Merge "DO NOT MERGE" into eclair

Merge commit '4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp

* commit '4d69ac6695246b8df06a6583044dc4712d81a956':
  DO NOT MERGE