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