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

Change-Id: Iecf5c7690f8fd3156bd7dfddbe0934b58e387e3d