Merge "Update list of mainline-involved files"