Merge "Move resetState from FieldValue to LogEvent" into rvc-dev am: b639065e0a

Change-Id: I29286c7d1b32ec9defc379eadcda48690a9bb0d1