Merge a6da8f9ffbf489e579f2933ee760e8275e7609f1 on remote branch

Change-Id: I130508ea3d09ca444f6545d9ebd91c1c75f0206f