Merge "Remove backwards-compatibility modules from I3947eaac"