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

Change-Id: I632b14f0647010b5b8d46053696c45d2e17700c4