Merge e3f8fc633def39cedbb411b3307ebc393bfbced2 on remote branch

Change-Id: Ic8613ff60af80bc3af08f7b482ba9357adc1ebe8