Merge "Refactor the common interface into an abstract class" into mnc-ub-dev