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

Change-Id: I27f8fcea9bb7fe1ae3d66722392ae13264f31557