Merge 372d9e58ab97e29bead2c3796b6389edf8486057 on remote branch

Change-Id: If2f06866c8bdeaf106784f7bd2febcd5f48b1ab3