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

Change-Id: Iabc0cbf36e4a3db814e7a3f9e6dcbfe23bfd7ac9