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