am 53455357: am b56c6437: am b1d01411: am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

* commit '534553579228d7802b410b4cec41b8c0f4fd9079':
  Allow debugging only for apps forked from zygote