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

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