Merge "Update Dockerfile for PF base image"

No match.