Merge "Rely on the platform -std default." am: 26989871a5 am: 35368f2475
am: 274347ebf1

Change-Id: Idce8ffa834e8ae8298d3ab8f516b4f4f31b02f18