Merge "Fix installation issues with generic-resource-api"