Merge "replace getSubId with getSubIdUsingPhoneId"