Use ContentNamespace rather than NearbyNamespace

Reflect change in Icdfb72770e85a2525b8cc8699d7c1201d6f761c4

Change-Id: I63ec747bf63b6df450a938a8d438a4c42f97bd2d
Merge "Use ContentNamespace rather than NearbyNamespace"