Merge "Fix xml coding style (turn tabs to spaces)"