Merge commit '88316f709083652c4aa9eca6f64631c0ec77fb07' into eclair-mr2-plus-aosp * commit '88316f709083652c4aa9eca6f64631c0ec77fb07': do not merge - Fix for issue 2184627 cherry picked from eclair-mr2