Merge "Remove undocumented functionality from init." into nyc-dev am: 27fe8c9
am: 8bcb7ca

* commit '8bcb7caf0eed34bd5ea1a6f1e119ebcb7f4501a5':
  Remove undocumented functionality from init.

Change-Id: Ifbf18244bc463ad7f9477309188da67236f0e306