Merge 681fe7bf9819b6e16808b0169f07d1c815d6c56e on remote branch

Change-Id: I5730540a3cffa02cc742c58a032d1f13ddd91b10