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

Change-Id: Ia032868e2cd5e2c2632ecc3f66805ee5b1883763