Merge 6c00338be28b89a918d499dfa1cacad059046670 on remote branch

Change-Id: I7144ca076384dd42d3e37414b7aac511da5c0f1c