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

Change-Id: I2222b2ed2479a748cf3124357f91701afe4bd04f