Merge a1792408ce74a96375c62769ed0a10d879336634 on remote branch

Change-Id: I5f6c3ecf254767e6f7d3c75ac957561b21482cb5