Merge "C++14 is the default now." am: c85724298e am: d53231a511
am: 9e2569e26a

Change-Id: I48ddbdbefd272e37e05c3fe577fe62aae2cc9bc7