Fix namespace handling for attribute names am: ce81ff4e77 am: 71608a1ab6 am: 11fc885973

Change-Id: If054a4f9386ad5293a3e6e33a5c9b85ca5a3ddac