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

Change-Id: Id2e6a870ff207eb25844ecbeca6b80630b2e0d28