Splitting some methods into individual compat classes

Change-Id: Id5a2650b290367d1574eb56346beca389900596b
5 files changed