Fix namespace handling for attribute names am: ce81ff4e77

Change-Id: I5c0abdc4e2c6f1b35c0ad87788304b22c4fa1ce0