cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb

Change-Id: Ic18859f171d03f8562ad91761da40a55b59f47ea
1 file changed