Merge "DO NOT MERGE Make Conferenceable an abstract class" into m-wireless-dev