Merge "Fix NullPointerException to get sim accounts"