Merge "Change drm/crypto service names to "default"" into oc-dev am: 7faba5ea99
am: 1ad732bad3

Change-Id: Ibe394dea0abbcd352918cdfb874999ab55736b2e