otablock: Disable only the actual activity, leave the service on

This is apparently shutting down uncleanly and frequently leaving
unwanted stuff active :(

Change-Id: I08e7b28adf1ec0725b82357df96beda2527e2f16
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2