Merge "Use the installer package name for broadcasts" into oc-mr1-dev
am: 0862898a34

Change-Id: Ie36d31dd4143695485b731a5446dd6b35866bd50