Merge "The reset() should not throw exceptions"

        synchronized (mLock) {

            if (mServiceConnection != null) {

                if (sDebug) Slog.d(TAG, "reset(): unbinding service.");

                try {

                    mContext.unbindService(mServiceConnection);

                } catch (IllegalArgumentException e) {

                    // no-op, just log the error message.

                    Slog.w(TAG, "reset(): " + e.getMessage());

                }

                mServiceConnection = null;

            } else {

                if (sDebug) Slog.d(TAG, "reset(): service is not bound. Do nothing.");