am 5503ef10: DO NOT MERGE - Move scheduled alarm scrub off main thread

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