Merge "Store annotation info in LogEvent/FieldValue" into rvc-dev am: c0a89245 am: 4d27d362 am: 4a59c6c3 Change-Id: Ic00e8ae67b0c0956d7fda84e94ab958829229315