am dbee95ca: Merge change 6317 into donut

Merge commit 'dbee95cacff9d2faf30638e64abe26fbeb128787'

* commit 'dbee95cacff9d2faf30638e64abe26fbeb128787':
  Make enable/provisioning of the backup service a two-step process