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

Change-Id: Id32203ab069343410a02c03956a7c6135f8a1b33