Merge "Move hidden API warnings into resolvers"
am: 70e88d6df6

Change-Id: I40d9fd49801ab5840bcbaf28386df480525fca31