Merge "Enable c++17 in recovery_defaults." am: 6a333cde10 am: 287881d558
am: dfc4268a07

Change-Id: I46381125e958e46c042ef07584cbf1f947ccb74e