gcc 4.8 fix

Change-Id: I8bd1cf800c7fba23c0cda7e7d54b5253a0513782