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