Merge "Move isAdminTestOnlyLocked inside synchronized block"