Merge bb958585fdb7a9787d5b0d1de0febdeabea26061 on remote branch

Change-Id: I5cba0d5355f0be5053a8623e34da07c66348cafc