am 49fc4a9d: am fe17db4c: (-s ours) Merge change I4db11d50 into eclair

Merge commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe' into eclair-mr2-plus-aosp

* commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe':
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.