Merge "[automerger skipped] Merge "Clean up SubMgr#getOpportunisticSubscriptions." am: 103d515c am: b4750ecf am: a5c0f26e -s ours"