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 Change-Id: Ie4bbacd37f06977c6846033b4917e823cdb47ccb