Merge "Do not expose namespace vector" am: 2c9326fd9b
am: b8d01f4cbf

Change-Id: I806a6958dbd30457ab1233f7fc3371710ce68e9b