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

Change-Id: Idd9a133aae6cfdfd5c0072d08c43a8848d4a14ba