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

Change-Id: I0a6d54d811a63c2e3356f854a7b8f26f12a62519