am b8ef3a2c: (-s ours) am 624392ed: am c0e53271: DO NOT MERGE Change to make STK related intents protected.

* commit 'b8ef3a2c8a7a1351052671f87a995e3a25a176dc':
  DO NOT MERGE Change to make STK related intents protected.