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

Change-Id: Ia2f756d0e26be2758bf5e63a4eec458af2e2fd8d