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

* commit 'c0a21af7ceb03ffd3fca3229475e85ff6868fb28':
  Remove undocumented functionality from init.

Change-Id: Iec1988c758a6036f428dac4f74940f9a02e07ba2