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

Change-Id: I63ce89af5ad4fe7f755ae675d18a87e921db7ce3