Merge "Adds placement resource provider traits API calls"