Merge "Make getAliveUsers() and getUsers() as @TestApi." into udc-dev