Merge "Finalize STK call control strings" am: fe3e0521f1 am: 2dd288e5e4
am: ce3f2a7f6f

Change-Id: I890e6202337dabe6895dcef6b76f9b6e3c24a37d