Fix missing namespace declarations.

Change-Id: I76dcd99a3a7776bcd9b22fff14bd0e0a99bbb6d5