[automerger skipped]Merge "Finalize STK call control strings" into pi-dev
am: cc865e25d6  -s ours

Change-Id: Ice820ecbb7c99f408a81f9880ec352358e61e076