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

Change-Id: I3465c48eca9e7f6659363949e3984eadb80c0b9a