Merge "fix service binding" into oc-dev
am: 4eaeb91e42

Change-Id: I89e8c155baf17cb9c6988dda4723fef3daafc545