Merge "Use bug to track all namespace related TODOs" into rvc-dev am: e18a978f9d am: 11db12e433

Change-Id: I59a225e54eb6d826116648c8a3560bc60906d02f