Merge afc59b9dbba7bdccb319cb001b7835b17ee2a80d on remote branch

Change-Id: I4e9223851780b502146d5c3a470c9f789ec2dbcd