Merge "Remove duplicate empty lines from file templates." into studio-1.2-dev