am 9bf9e12b: am 42da80fe: DO NOT MERGE Change to make STK related intents protected.

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