am 06a37b5c: am 9bf9e12b: am 42da80fe: DO NOT MERGE Change to make STK related intents protected.

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