Merge "unbindBackupAgent and initialize inFullBackup" am: 36654ffef5
am: 3a13bb43f6

Change-Id: I44fcb1ff849d39ff528adb85f8d76563eb9b9d52