Fix build with GCC 4.8

Change-Id: I921689afe3c4f0a87ce942c130a3842510488aa7