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

Change-Id: I10f38277b2bdc364ea5f8caba08475badac325f4