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

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