I think I fixed the unsubscribe bugs...

Change-Id: I14f3ca940f3fd7864d82765c08c97f2e21df9105