Merge af3a24765f348fd9f99583e9b9424181e5a98f35 on remote branch

Change-Id: If9956f953c3f69754caec323717b11699049cccf