Align on 5.8-SNAPSHOT
NXP-12375: follow Work and WorkManager refactoring