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

Change-Id: I9bf520dd5e95438f308bdae9e0ff0e2006410741