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

Change-Id: I767b45421e38e838884a24322a98cf99e6486547