Merge "Don't fail if default namespace isn't found" am: 873d867e3a
am: 5199628d06

Change-Id: If1e9f69627c77f07c64fb4d0af489e5dd00b6849