DC: more changes for proprietary repository

Change-Id: Id6e66a7882d3ae74e9ec5ab904f8bdfb8cb86176