Merge "Don't fail catastrophically on non-existing namespace" am: d11603646a
am: b931f21570

Change-Id: Ic89c556b8bb40e89f2038472742437e1c38b3279