Merge "SubscriptionInfo contains int cardId" am: 97c9aba888
am: 212e2576e1

Change-Id: I5bee233bf3603a11f7da8b04a51919da838cb130