GCC 4.8 Build Fix

Change-Id: I88a4cec56760df388cb12dd425fac021979fabb9