Merge 3254395841b3d4dec4b309494dac256fe2c68aa4 on remote branch

Change-Id: Ieb60f186fc41fccb51048b20c8d4e8adee1303b2