Merge 4583b66c792459240b367483f2bae29ef56d9f66 on remote branch

Change-Id: Ie1593d30666565ce07074aef8421d84926472c8c