Merge "Fix 4 broken work profile tests"