Make default namespace an "alias" for runtime rather than the other way around. am: 5fe1b23d54
am: 3f7adc79d5

Change-Id: I5a6ece4af7bfb24f4c3ac64a348e937813467bf4