Fix C++11

Change-Id: I61c388cbc1bd4ded76f7cf4bbc8ca10a9c5f4779