Fix C++11

Change-Id: I04e06a7abbd3d008804022eec3cf132b9d9681ba