[automerger skipped] Merge "Conditionally remove the package->id association...
[automerger skipped] Merge "Conditionally remove the package->id association and NOT the player" into rvc-dev am: 204a1186 -s ours
am skip reason: Change-Id Ie283e7e9bfdc3d81ae71acbf579c5113c5720bbb with SHA-1 e27f2533 is in history
Change-Id: Ic9d2e887a7d9107256d580d3afae5b5842a2f0e0