Merge 3f6a69f77e1410939d1dc23274ba463355bcf3af on remote branch

Change-Id: Id6c7f35c7d1457ec537c090727c9603e7933049a