am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread

* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
  CherryPick 06942bc4 from hc-mr1. do not merge.