Merge 3255022f5a382fe873499a16e0a6fdd6a28af681 on remote branch

Change-Id: Icb94d5d39d0e5de70a3d43be8e64ee17067d02bd