Merge "API Cleanup: Moved package name computation to BindingMapping."