Merge 3254395841b3d4dec4b309494dac256fe2c68aa4 on remote branch

Change-Id: Ifd26e94f2facfd0d25eb10dc50a73337030a8be4