Merge b8c4f4d54879a0d3cdc6f16ed28664e01100aa82 on remote branch

Change-Id: Idaa2e602a68aaff66006fbc08b458249de78adc3