Merge "Fix unit test OnlyOpportunisticSIMInserted"