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

Change-Id: I0bcd492d57c8c3ae14090b62d74c1eeb691a8d3e