Merge 418cbe9a1f153dc8570bcf5e20e12e13f45e4f32 on remote branch

Change-Id: I18a2ea15b46fd800639081eb1915335163a3c7cc