Merge "Rely on the platform -std default." am: d2af70179e am: 7493c3bc60 am: e39fa388bf
am: 7d3f1341be

Change-Id: I16f6c492c25f103ab1f8ed00d088d6773c9608fe