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

Change-Id: Iae2eab9bfa5c8b130d46eaad4bbcbcd5d00e163e