Merge "Handle remaining hidden API usages"