Merge "Change default value of preferredSubId from INVLAID to DEFAULT."