am bf7c70fe: (-s ours) am 5503ef10: DO NOT MERGE - Move scheduled alarm scrub off main thread

* commit 'bf7c70fed785a9024e5a43ea6fff78340bff8382':
  DO NOT MERGE - Move scheduled alarm scrub off main thread