Merge "Merge "Use system property to get the package name for media update" into pi-dev am: fd3e190cbf" into pi-dev-plus-aosp