Merge commit '00b17659' into eclair-plus-aosp * commit '00b17659': Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.