Merge "Reflect removal of vndservice_manager object classes." into oc-dev am: 59ab9291cd
am: 25c610798e  -s ours

Change-Id: I9b78e325684d7504f0c1ec6b06f42cf66bbe3f14