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

Change-Id: I5b73c2852e5a4a85a2dbb0a0efb903f9df311fa6