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

Change-Id: I948f14c73030d6d0f0cae8b9e374962ad119f7f6