Merge "Rely on the platform -std default." am: 955648a915 am: 4594f50635 am: f1dffe0501
am: 19340be9fe

Change-Id: I094bc7c422a54b1bbf289e44e7882d5dca503c0e