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

Change-Id: I958ece2c89eaa41ded3ff76c04ff9e21e7b0ce94