[automerger skipped]Finalize STK call control strings am: f1306727f4  -s ours
am: 1cc701b4a2  -s ours

Change-Id: I70e1176396be7779b81c2bf6602eb9ca82e1dae1