Merge 161db6c189bc74b6977a5b252448ef4dea091074 on remote branch

Change-Id: Ia8a0c1f091674369bd27a27727ea82c71bad10b5