am 5a0c54a5: Merge "Remove home package name methods." into klp-dev

* commit '5a0c54a5112612777becd7a0f12f74cf720c1b7f':
  Remove home package name methods.