Merge "Move BaseInterface typedef from protected to public"