Merge "Support opportunistic subscriptions." am: dd442c9dc8
am: 7efc09f8cf

Change-Id: I4c1e1c887480d0ef9e784b0e8e63311bef77d903