Merge "Store annotation info in LogEvent/FieldValue" into rvc-dev am: c0a89245 am: 741d1045 am: 7be4c20a Change-Id: Ia98deed8701f2c13a4bbf196fb76be6813decfe3