Merge "Fix namespace handling for attribute names am: ce81ff4e77 am: 71608a1ab6 am: d8fd7f6ac9" into rvc-qpr-dev-plus-aosp