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

Change-Id: I4d43f9e9518b900c592b9714e492791337d65ba0