Splitting some methods into individual compat classes
am: 35908f9e67

Change-Id: I52bcc43c3c8978df9cb6414784c4bc96da2de9cf