am 705accc2: Merge "Init: Remove unused variables"

* commit '705accc2a3e3ab29308454212a6029821426ef4e':
  Init: Remove unused variables