Merge "Don't use $PPID"
am: 6309ef4287

Change-Id: I893f9716076234199bce3d445388b55e642854f2