Merge "Rely on the platform -std default." am: aaa1f8bbe8
am: 048490cc68

Change-Id: I6f88ae28b8aaa6de1d2a0c8b2efe87923549666b