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

Change-Id: I83ea7be93892f2c5f6a704c0beb63f2e8db66a6f