Merge "Fix a security exception when unbinding services" into oc-dev
am: 33532e0208

Change-Id: Ia3a14b69f27106a6c7ca4a6625a0a103fb752c51