Replace deprecated Xml::namespaceSelector call

Change-Id: I68b513e70ab30febc755a8e6e1942a3d5b6c1118
Merge "Replace deprecated Xml::namespaceSelector call"