Revert "Make default namespace an "alias" for runtime rather than the other way" am: 916b426a96
am: aa5696854e

Change-Id: I1451f40733db5375efe26f076426a495c09e17ec