[automerger skipped] Merge "Include annotation property values in output." am: 989e767e84 am: d12d0a1939
am: 41e0ce14be  -s ours

Change-Id: Ie9d9d329c6008b16f88aaacaf84d4a2f64663a27