Merge "Remove hidden INVALID_RESOURCE_ID in unused param"