Merge "Fix non-panda builds"