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

Change-Id: I4cd86be9aac1f13ee8ef67dc797a020e4940c62f