Merge "Fix OwnersTest when run with -e package"