Merge d49d3b2f970ce5701d95ff8b2db30e4719e9585b on remote branch

Change-Id: I2fbca7323dcd803016926ea28d2ee3a7959b9af2