Merge "Add namespace handling in attribute values" into mnc-dev