Merge 11ea3bf995f748b51034d76bedacb0735b186756 on remote branch

Change-Id: I02a8c251ef3f511ce20dbcc76b4d873c0e37cbfd