[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo constructor""" am: dacf789cfe  -s ours
am: f810847d2b  -s ours

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