Merge "Include annotation property values in output." am: 989e767e84
am: d12d0a1939

Change-Id: Ie32eb0da2c7d21aa8560362ee4a90768cee0e6a9