Merge "OMS: fix listener callbacks triggered by changes to target package" am: 637dbcbb6c am: c2351d1d40 am: b361ec15e4
am: 9a78e68f74

Change-Id: I95f16894439cd9aa91f6e73b0b626abd53b42a3a