[automerger skipped] Merge "Add logging operation ids." into rvc-dev am:...

[automerger skipped] Merge "Add logging operation ids." into rvc-dev am: decfe4b3 am: 40c56477 am: 968e0902 am: dc71567e -s ours am: 6a393017 -s ours

am skip reason: Change-Id I2f85d6889e946219557d26b28334d4bacde06b12 with SHA-1 48811ee6 is in history

Change-Id: I4aff831a66bc9a4da5e55a5ec80ce631ef31a230