Fixing bug where subscribe happened even if should_subscribe was false

Change-Id: Ie33e0b6cbf5b34abd482dae1b618bde4fd2b7738