Merge 43bc69627b8c6a588f90a18aea7e86e34579a15c on remote branch

Change-Id: If249ca523a2417e52d171aef56b39310c7fe19da