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

Change-Id: I0a163f3474a15f22cf42ebfec5569fca44a3a9d4