Merge "Do not use hidden isPrivilegedApp"