Merge 699de592f0aa096968bd672671b0f4db836226c0 on remote branch

Change-Id: If94a03642278a2898332f20ec9b8ac43f0238778