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