Merge "Use py3 features in merge_csv.py." am: 3e6f701980

Change-Id: I60cd2e157d22c847cbb0bf436c2b46802121fe15