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

Change-Id: Ib629e24a539fe2d6465a6f55ba3c42444f4864ff