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