Merge "Merge \\\"Fix adb backup/restore\\\" into nyc-dev am: 45c79447ad am: 77d15483ad am: c0f59ce9e8"