Merge "Conditionally remove the package->id association and NOT the player"...
Merge "Conditionally remove the package->id association and NOT the player" into rvc-dev am: 204a1186 am: 97c6b29b am: 919705ee
Change-Id: I8e89a9cbf1d562fd46a0ee3bce881a1f858fdd2c