Merge "Rely on the platform -std default." am: 6bd70bc749
am: d487716f87

Change-Id: I090b6b85c1e2406f16563ad9b16078d655252ad4