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

Change-Id: Ia292d94402f2c0e46074aeb119867c6f470fc1ad