Merge "(reland) grade manifest target level to 8" into main