Merge "Additional fixes from bring-up:"