Merge "Update SubscriptionInfo constructor"
am: 05a7338b7b

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