Merge f8ed4b23c33d9d761a08a419934d22c351ee3017 on remote branch

Change-Id: If80b3a10c932e2636048e579516a20a3bf017801