Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread