Merge "[automerger skipped] Merge "Clean up SubMgr#getOpportunisticSubscriptions." am: 103d515c80 am: b4750ecffa am: a5c0f26e51  -s ours"