Merge "Fix trivial hidden API uses"