Merge "Fixed hang in the case of multiple sps id." into mnc-dev am: 16b019a6 am: 5ecccccb am: 5cf7f81c am: 33fef92f am: e0f81b63 am: a8c9c117 am: 38b8663e Change-Id: I4080998173ddb596bed2ec64d875b5ce4eb52e68