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

Change-Id: I0a12b5fa3503e7c18fc40797c1a342a99055ae64