Merge fe3c829792364f45ed8c36f83312a4195ddcf440 on remote branch

Change-Id: I9e3a2db1e12542a1c0b31b8f179936577cd3573e