Merge "Separate namespace acquisition from library loading"
am: 097381382b

Change-Id: Ibf2630c04745836f2c0b68a823747832dd801acf