Merge "Use system property to get the package name for media update" into pi-dev