cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a

Change-Id: I4cb22b628978c86b5c07ff80b2fe8547e25015a1
3 files changed