Merge d6f3c8a94b922826112ffb107d028d522f7aae5a on remote branch

Change-Id: Ifea751d00e7c6b7d9dcde8d8ffded519bdd4aff5