Merge "Fix incorrect API comments of getSubId()"