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

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