Merge "Fix the SecurityException in PeopleServiceTest"