Merge "Fixed hang in the case of multiple sps id." into mnc-dev am: 16b019a620
am: 5ecccccbd7

Change-Id: I703c38dd57bcae4d743f7b63aca28538f617cb70