Merge "Temporarily address gcc 4.7 breakage."