Merge "Rely on the platform -std default." am: d2af70179e am: 7493c3bc60
am: e39fa388bf

Change-Id: I730e0a50202cba9077775cb89ff9b9af1c7158fc