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

Change-Id: I8763bd099f4a464db3933c193fda651303443cc9