Merge e4ca343f217ba5b0723b1ed8fe57ea0c171599a1 on remote branch

Change-Id: Ic748fc474ad2a1a6e5251b3d176110de99415dc4