Merge 089cb754cb08d66ffee7e749df58280da9ed98d7 on remote branch

Change-Id: I20a10a4610b581561782c2b60b543559125b8dbc