Merge "Add assertions to SvcLogicExpressionResolverTest"