d2s: Decommonize vaultkeeper

Change-Id: Ibda68781f430d3f42942ad78587b4d50b7204717
9 files changed