Merge "Avoid runtime namespace becoming parent for classloader-namespace." am: d39f262aad
am: 409d6e5360

Change-Id: I1cced499e3c2fb55a3d1a80b2b4e2b3d99ce6540