Merge f4495355958f588e07347a6aca2aefe76882c47a on remote branch

Change-Id: I2bd0bb97f3ddfe2f096ecb616d54c57caa43cf8a