[automerger skipped] Merge "Support opportunistic subscriptions." am: dd442c9dc8 am: 7efc09f8cf
am: d65956f546  -s ours

Change-Id: Ie9f93f67d10901691de85135a414f7826d81482f