Merge changes Ia150604c,Id4b9565f

* changes:
  init: Remove the DebugRebootLogging() function
  init: Combine two if-statements