Merge "Remove vndservice_manager object classes."