Merge "Fix adb backup for encrypted case" into lmp-dev