Merge 06c2fd37e0fc442c3cfe694e4e944116234af942 on remote branch

Change-Id: I2b4fc1ab4a13b5debe7c85f8ea2ffb269334627b