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

Change-Id: I9c01529786fe2e77dc74fe051464b5f738d54035