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