Merge "cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325"