Merge "Minimal fix for adb backup." into mnc-ub-dev