Merge af5b20d26c7be0899a76ed52800a8259049ba925 on remote branch

Change-Id: I67072d9e374207aa24d58e0a59a9aea6716c9424