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

Change-Id: I1526021cf49f873159b66eeddf2cc39ad71655eb