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

Change-Id: I6e75ddeb73246d277c78e3bef8872f925c2226ce