Merge 36835e0289cba1388674bf741e78f4de61893842 on remote branch

Change-Id: Ie52e51bfe5d5374ade88c19f8b100814d10bfefc