Merge 41678376fe9c79d261abd43d3e0baa249b77707f on remote branch

Change-Id: I2150ead6d4bc7fa6ba3b972e95bca9c4b71f63c2