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