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

Change-Id: I91e248a169f9b7f1aa742dbca4fb24d98aef2a4f