am d5654147: am f7ed8208: (-s ours) am 9bf926f5: am a46312c4: am 2a4cc576: DO NOT MERGE Change to make STK related intents protected.

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