Merge "Rely on the platform -std default." am: 6bd70bc749 am: d487716f87
am: 017cf7567f

Change-Id: I55305bf342be3f19993cc2c988c90d95f34647c5