PLFENG-1968: Android, save file in xml extension
PLFENG-1968: Update comments, spelling correction