Shortcut: Improve backup & restore
am: fc4cf2da34

Change-Id: I28f431158929dd585b0c7523ee6e16798650f98a