Merge "Make Conferenceable an abstract class" into mnc-dev