Merge c320019fd34e11d843e74c0fee27e766c94bfa1b on remote branch

Change-Id: Ie1372f21330b108d5c5717c240eeec467e3b7716