Merge 4c706bb0c09920ff7c9bcc1618c7e777f7d59773 on remote branch

Change-Id: I41b2e005becd385726fc6c00a3cdcb40388f6763