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

Change-Id: Ia93ef1c3151c9bd2dd7881142639aae2527bea87