Merge "Support for writing annotation properties to CSV."
am: 905c1de6af

Change-Id: I5910050edf6583371128c13d328c9986af186fc9