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

Change-Id: Iced347670c320d41353fae23dfc5f6ff3c577191