Merge change 20218

* changes:
  Correct the backup manager's identity around wakelock use