Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp * commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3': DO NOT MERGE
Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp * commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3': DO NOT MERGE