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

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