Merge "otablock: also disable BroadcastReceiver" into cm-10.2