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

Change-Id: Ib48f0544e30fea74de84d5f25a6ca8d8b21eb460
tree: aec84de92900e7ce7dab78528f53d76995c818bc
  1. service/
  2. PREUPLOAD.cfg