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

Change-Id: Ic3dce2aa3e790febbc266cd80b461ac24f510774