core and telephony: Additional HSPAP support

Change-Id: I5e921d2308d873678d6ef67a91cff50d383a176b
Merge "core and telephony: Additional HSPAP support" into jellybean