am 0c6790a7: am 8ad8bfd9: Merge "Use the application name instead of package." into klp-dev

* commit '0c6790a7453ed8b5edc672a209b0eb32532cb1bc':
  Use the application name instead of package.