Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am: 8303fb42 am: 6cbee7a7 am: 4ad7c2dd Change-Id: I0cd56262c2b72dd48fa3c5263e60bee9feb65658