Merge "Add more userspace reboot + apex update failures scenarios"