Gcc 4.8 Fix

Change-Id: I4bbdcf2ec4efa60aac24a961b44a9dd89154b96c