C++11 fixes.

Change-Id: I37266cade10b21cef2db589fa493296542a47967
GCC-4.8+ Build Fix

Change-Id: Icccc1eed6a2d8dc5c7649a2c9bdbe5caa3895e5a