Replace default methods with helper classes
This is a workaround for AbstractMethodErrors thrown by on-device tests when they encounter default methods.
This is a workaround for AbstractMethodErrors thrown by on-device tests when they encounter default methods.