am 98a8a542: Merge "Restore "Late-enable" logging"

* commit '98a8a542f95e41c09d214a329a940b270f08f5b3':
  Restore "Late-enable" logging