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

Change-Id: I6b4a91feded61f6961204b716ac2e3e7c9dbcfef