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

* commit '45f2b924b653c485b18204ae84747000c02ddcf6':
  Init: Remove unused variables