Merge fa3d269888afe6c086304fa785cdae1339d45cde on remote branch

Change-Id: I2fe0c1f6ff73600f0f889603bc9e51ba0fed2820