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

Change-Id: If2b502226ab5821c5d01a0896c02220fd64811ac