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 am: 48e9e726 am: 1ff5470f am: b2b42fe7 Change-Id: I5b5ea5a5f6247de88f46b21de4e7481585a217fc