Logging opera-detection cleanup

Change-Id: Id056974a0157720035511e6874bb1918fc264cca
Merge "Logging opera-detection cleanup"