Merge "CFI for individual subscriptions"
am: 5dd67e5395

Change-Id: I3bda7879b90000610fa2014dc73d97b21f775e46