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

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