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

Change-Id: If62e74feb590aeed6a1180a5161b96ffa5a3c4ca