cherrypick from hc-mr2 Change-Id: Iec29f5d063c2c42a56afb971e071b4535559ac01

Change-Id: I5232cf7ed14fc015e3d1184e399d802fdced593e
1 file changed