Merge "Allow different namespace types for different classloaders" am: a61c48d5fd am: 9b1d1cb923
am: 08aa99d622

Change-Id: Ic13ee0d3e204a28324b91b99ec2a9f34579fdb1a