Merge "C++14 is the default now." am: 572bd35933 am: a4cb3c1c2d
am: 54ea634edd

Change-Id: I620848d2cc08f2b73c0d1e274011fe59a475b9c5