Merge f6085d91cb22b8c6b02ca32b04b39d10e96c1b27 on remote branch

Change-Id: If2f9a2f43cb35e12140f4bc8236ee2728fb00f80