am b6eeec4b: am 1b6c85b9: (-s ours) DO NOT MERGE cherry-pick of CL I0ff20aa2 from eclair-mr2

Merge commit 'b6eeec4bf7f905c57b81c6bc6d0789a4d2945058' into eclair-mr2-plus-aosp

* commit 'b6eeec4bf7f905c57b81c6bc6d0789a4d2945058':
  DO NOT MERGE cherry-pick of CL I0ff20aa2 from eclair-mr2