Fix namespace handling for attribute names am: ce81ff4e77 am: 9f8e073e22

Change-Id: I7425f2723b3b895cffa887a8c909f948134d0d80