Merge 925742eb117e2eeb331caee366997415284638c0 on remote branch

Change-Id: Idb1265f214d26520106eca315b5fbb6ac17b8897