Merge commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1' into eclair-mr2-plus-aosp * commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1': null check
Merge commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1' into eclair-mr2-plus-aosp * commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1': null check