Merge "Address TODOs in 28.0.cil mapping."