Fix C++11

Change-Id: I3f078a3692b3057fb736529794e882495f46a222