am 9e71d2a2: am 5a22d066: am 86e7ef61: am e810a84d: am 7213edfe: am b10c73b1: (-s ours) am afb60bbc: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '9e71d2a2':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.