Logging opera-detection cleanup

Change-Id: Id056974a0157720035511e6874bb1918fc264cca
(cherry picked from commit ec9fb9a8be68e4fca4afdd4e3861f0048d1463d3)