Merge eff9088ea7de279d68d2d59c061ff1d08681269e on remote branch

Change-Id: I2b02117e6b1714174acfd8dc7c9d6830bd6e4164