Cleaned up bad usages of Abstract*Framed classes when interface should be used instead.

Issue: FMA-46
Change-Id: Ic77cbb372354861462dcd5abc755901872ce0425