Fix problems with entity references and relaxed namespaces.

Change-Id: I5c19ad97c98e6276129ed7228cc38d414b9517db
http://b/3090550
2 files changed