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

Change-Id: I1cef46b35a89fd91dce268089757fc2edcccbff4