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