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

Change-Id: I36b09cf6b75932aa978c603c6d29ad0f87dad8e9