Merge 8c8b3b3d7f640c8ef2c6b3e7b0a6093f11e2a70e on remote branch

Change-Id: Ie87cba8fe7711370d86655d820c8e7352acd83ad