Merge "Add assertions to SvcLogicExpressionResolverTest"

No match.