Merge "Finalize STK call control strings"
am: fe3e0521f1

Change-Id: Ia60f7a5b21d3cca448cc46166e4c4e5ecb0f6d53