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

Change-Id: I8df56552dbfdcd7f93d764c9cacc49c2ca6fe12f