Merge "Removing non-preferred activity from resolution set should not disrupt...
Merge "Removing non-preferred activity from resolution set should not disrupt the preferred resolution" into oc-mr1-dev am: 0b4b9f9c
am: 116ae427
Change-Id: I7a38ec63bef300e1fb0a6c49d4b9ee9553ec93a0