Merge "Parse annotations within LogEvent" into rvc-dev am: e9133b93 am: 61c6b579 am: eae09ccb am: 2276da3b Change-Id: I9c4d59674101999b860d73e2b5940964e2e86461