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

Change-Id: Ia812dbac0ad2f6e113bbadb5f0c8c2d0d35139c1