am f7ed8208: (-s ours) am 9bf926f5: am a46312c4: am 2a4cc576: DO NOT MERGE Change to make STK related intents protected.

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