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

Change-Id: Icc980c98911265295abc0a23bca0c922dd0671f6