Merge 7edd79694e2334370d1b61dd2c4ce839c6ba0649 on remote branch

Change-Id: I43cf08b0932949abcf27c28d9dcf7774842d91b3