Merge "Store annotation info in LogEvent/FieldValue" into rvc-dev am: c0a89245 am: 741d1045 am: 6e5d79b6 am: ea36b89f Change-Id: Iec004127fb8c04b59c7d840823367094080db687