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

Change-Id: I14d16f460146ac49d89334e41409a90908f04671