Merge "Remove undocumented functionality from init."
am: 4888d79

* commit '4888d79a945ff62b933f500317ed049031f77551':
  Remove undocumented functionality from init.

Change-Id: If664570c994a4cfcfe851c56247cabcf3f07cb51