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

Change-Id: I7c1806c36a731ce823e45b2fd49cc7793ae50e3a