Merge 674bc383a7150e79da3f54ac14ae459d61d2c04c on remote branch

Change-Id: I8aee33f3d1b90a099405dd2ee892c790ac90a3b4