Merge "ART: Use C++17 extract/modify/insert pattern." am: b7abcaff75
am: 5105bdbf84

Change-Id: I2f81c801d1e6d72e01d1e34125b1889cc70339ff