Merge "Patch for setSimCardPower_1_1"