Merge "Rely on the platform -std default." am: 53b6fc5ddc am: 0ef01bab39 am: b48bc88b75
am: a16f14f826

Change-Id: Idadc8d71628f57e8c50abc6dd1a928dc42590fbc