cherrypick from hc-mr2 Change-Id: I0c3a19f11790142d8dbc7bdf354542c69c3c754f

Change-Id: I1c10a5e8780fe264ab2be37bc127860d2c0e8242
1 file changed