This is another step towards getting vendor managed by dep. Addresses: #889 Change-Id: Ibdc3102eee25d6e873f4f418d17f0b4e46b38d9f