am ca7bf531: Merge "Rotate logs only when there are actual operations"

* commit 'ca7bf53189c70ef0f687d54d772e5eaadc0b1c7c':
  Rotate logs only when there are actual operations