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

Change-Id: I6832b42ba46681801724838c97951f92967c259c