Merge c4af91ddbf215076ff09bbc9d5f680d3859c7ae9 on remote branch

Change-Id: I80d22d78dc4e5b7a039d30ddfc91ec6eac921443