Merge "Extend the service configuration for the binding service." am: 7145807316
am: 45f38d4f48

Change-Id: I333b91331b27119f9027e46f5c5c31526fdef231