Merge "Delete L->M upgrade code."