Merge "Finalize STK call control strings" into pi-dev