am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev

* commit '5a36e06ab2289073980b6147e13c8c03b94e5a80':
  Secure a handful of framework broadcasts