Merge "Add UID isolation CTS test." into jb-dev