am a46312c4: am 2a4cc576: DO NOT MERGE Change to make STK related intents protected.

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