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

Change-Id: Ie912157e8341b88120e733c94f6d6d16e762deaf