Merge "Make runtime namespace visible." am: 3ea7785ee9
am: 79c48f1a83

Change-Id: Idf39f173275cb6721bc5972ffd37be57847df9f1