Merge "Handle hidden subscriptions for different cases."
am: 80edc71e90

Change-Id: I3afd8e4623d41dfbf894f847fb603f97fdd2e326