Merge 959b47efe55763fa1f7bfb2b95c5d5bec1a25106 on remote branch

Change-Id: I285502b67444a4e5a406ac8161ebaabde318a4f7