am e530c41b: Merge "Protect a bunch of broadcast intents" into klp-dev

* commit 'e530c41b57514d419cdc7a7b14802b6954d3293c':
  Protect a bunch of broadcast intents