Merge "Remove vndservice_manager object classes." into oc-dev
am: f8a18d47a1

Change-Id: Iba5fd78ab1d578878cde958b489c57959ac6a290