cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51

Change-Id: I1b027de2c5e5cf370f19d7b64807135b1d0413da
2 files changed