Merge "Fix logging crash in ResolverRankerService model" into tm-dev