Merge "C++14 is the default now." am: 780c6311c5
am: 45b91a1f15

Change-Id: I158d8414b34394892907dc48a2186a3d44335a37