Merge "Make PositionXmlParser methods static." into studio-1.3-dev