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

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