cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc

Change-Id: I77ae1a4f999ae0f4fff925bf8a7f9caf0b868329
1 file changed