Fix namespace handling for attribute names am: ce81ff4e77 am: 9f8e073e22 am: 2fde4200be am: 07a64c001f

Change-Id: Ie79a10e4f2a363668e4b44d416370a8bb9bec8fa