Merge "Improve the API help for format=xmlfm"