Merge "Shortcut: Improve backup & restore" into nyc-mr1-dev
am: dec5726c43

Change-Id: I6797978af8c131a8690bc1c71ccae281b4a94bdb