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

Change-Id: Ibc3d4f92c9d25893d23e099d9a74862777893438