Handle the case of zero users enabling the feature

Change-Id: Ib433ff17c149914c9df270dec132bb6f2ba24fb9
Merge "Handle the case of zero users enabling the feature"