Merge d3f03b90b54e4d2c5b9b22d98d9132b07d9dbeb2 on remote branch

Change-Id: I18b351eb90639971c350d29bf348315343999d31