Merge "Add a whitelist to control packages eligible for rollback (1/n)"