Merge 3b0cae1d46a1ceaa4e9cd136f9a5e51657bc528f on remote branch

Change-Id: Ic7a23663e7d27341ef23936713a457ec821e3585