Merge changes from topics "lte_ca_support", "ss_provider"
am: 8dedf2b5e4

Change-Id: I6906070f9df82b57e49c5edf50e8931aa5192cdf