GCC 4.8 Fix: Build with O2

Change-Id: If17d038b05eabbc0223cc314c119a211f28ab60b