Merge f6ee9e74b7e41a04219bcdc9fefb647cd20f4b57 on remote branch

Change-Id: Ib2d12375099cbc77318139109b690bc3b4cc55cc