Merge "SDK: wrap NPE in getAttributeNS when editing XML files."