Merge 4f04455c7db4712911e46dc970d61514ba428992 on remote branch

Change-Id: I00d7695f921f7f39936efdedd1c11c5a7f345208