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

Change-Id: I11137b0f1327691fa88acee67d9270fe509aa353