Merge "Extend the service configuration for the binding service." am: 71458073 am: 45f38d4f am: 9d85e43b am: f04350a0 Change-Id: Iaff16de9d18e17ae6c51aec5e1e9f5091720a2a9