278f99f1d7
Mostly pulled from WorkManager (cherry picked from commit f9b57800b1e457c625e99ed9ba0d58fff2d95ef0)
Mostly pulled from WorkManager (cherry picked from commit f9b57800b1e457c625e99ed9ba0d58fff2d95ef0)