Merge "Cleanup binding proxy instantiation"