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

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