restore dbs pipeline fixes

Change-Id: Id749c53c059737fa95d799d774f3fa94b402f084
3 files changed