Fix C++11

Change-Id: I5d00ac7e188d517202cb19e13222b260c7d8e0fe