Merge 61d4f41b4e811b484c7335af1ab8cf65da0eb378 on remote branch

Change-Id: I7026cd034333d649fca7680407d694fc449db417