Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev