am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread

* commit 'd6ce6791f26fd0a7cf89ded2847011a4894013e1':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.