Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""
am: 8303fb42e0

Change-Id: I0d241d8d861b75c6c9350f4cf3183e82fe868309