Merge "C++14 is the default now." am: 8183157774 am: 992916a6af
am: 7fe181bf17

Change-Id: I6f5c08e4122a0eacaee442a4053d1bc3a2f3f758