Merge c8411b79a2c0d881ae134f795d8c0f56bc6d31c3 on remote branch

Change-Id: Id6f78d703ab181bf12586d08cb0ac42afcdcc8dc