Merge "CFI for individual subscriptions" am: 5dd67e5395 am: 44d3865bff
am: a391c527ba

Change-Id: Ie7c3fd5521da156d34c6a70c1bfecb41c9cbc11f