Merge f8f5e681a3b8cfeafb4fa259afdb1cffd36b2143 on remote branch

Change-Id: Icb95a7830351ebf47be7b88001328e003c156ee2