Merge "Move xml common code into the common dir"