Merge "Store annotation info in LogEvent/FieldValue" into rvc-dev