Merge "Preventing zombie process creation." into pi-dev
am: ca6f36532d

Change-Id: Ie0c1ea1d658f719262f3e7473046a732915d7284