am 8cc1ce7f: am 932cd04a: Merge "Start using cancelFullBackup() when appropriate" into lmp-dev

* commit '8cc1ce7f2f2240ec29a28144ce4f0e66bd425aa2':
  Start using cancelFullBackup() when appropriate