am 53879596: (-s ours) am 5ccbad1a: 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 '538795962a684dc35c4a7aaa0c31457ebf578ac6':
  DO NOT MERGE Change to make STK related intents protected.