Next Attempt at CN Namespace Foo

We'll try the CanonicalNamespaces hook!

Change-Id: I4bfa02d6d4b517ffb96edbda272281effda161a6
Merge "Next Attempt at CN Namespace Foo"