Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread