Merge "Finalise STK call control strings" am: 249119da53
am: eef3fce35d

Change-Id: I1b9cdb97baecbb04052addcf14beca475a44200a