c488e1a2fe
This reverts commit b30abbdfb476117053fc023bcf1f9a46f47b259f. Reason for revert: Changes are affecting DC' installation/bootstraping Change-Id: I47d509afdb897d9064e603be9155277688bc02bf