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

Change-Id: I66a77643cae8a2652c1361215e6b10a30e45b96c