Fix C++11

Change-Id: I83ba219d7c9e9f00c91ab439665264deb9959c92