Merge "Store annotation info in LogEvent/FieldValue" into rvc-dev am: c0a89245 am: 741d1045 am: 6e5d79b6 Change-Id: I7d752d54472db3c02850c5bbd290b4ab38025314