Hygiene: Fix namespace uses

Change-Id: I28989a34b9621bf9278043595476ed66ce7df259
Merge "Hygiene: Fix namespace uses" into frontend-rewrite