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

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