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

Change-Id: I3bb5796f0b42c83ccb2f7cd7ce0889883647fb6f