GCC 4.8.x fix

Change-Id: Id922eb2c3426c1312adc2bb963a598e72514b0ec