Merge "Move hidden API warnings into resolvers"