Merge commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c' * commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c': Fix a fun bug with multiple service bindings from an activity.
Merge commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c' * commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c': Fix a fun bug with multiple service bindings from an activity.