am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread

* commit '9bce27a9ce916bdf363667ee67fc0ce50c533aa3':
  CherryPick 06942bc4 from hc-mr1. do not merge.