backup fixes

Change-Id: I784fee254e6d8664836ef2cf7f7af0cceb4fc8f4
4 files changed