[automerger skipped] Merge "Revert "Update SubscriptionInfo constructor""
am: 55e0fc887f  -s ours

Change-Id: Ib6287ee35e2ec1c2d64a067e1e136e18c27eb777
tree: b073604dcb63b1cf7bb236673c241f36171a20ec
  1. service/
  2. PREUPLOAD.cfg