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

Change-Id: I64d68464058464e0fa057f9b33dd6c02b3a5e39f