Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am: 0d1b1a253a
am: 4b48d48a19

Change-Id: I6e35567cd376666fefb1e9356ce7325595507f77