Merge "Use sh instead of ash in PAP"