am 11320079: resolved conflicts for merge of 486c1d0d to ics-mr1

* commit '11320079f69879ffcf5881f83382ae03449aea73':
  STK: Fix ActivityNotFoundException in 'launch browser' cmd.