Merge "Add base class for OptionsBuilder and PresenceBuilder"