Merge "Rely on the platform -std default." am: 329e73bda6 am: 6b24b5786d
am: 6655268162

Change-Id: I706151b0a0d0fede0ec6b681c9a15f6ffe60a5c8