Merge "Support opportunistic subscriptions."
am: dd442c9dc8

Change-Id: If10b6ab9cd647cb36febd9935ba81e8d7378ced7