Merge "Fix incorrect API comments of getSubId()"
am: 66a0899785

Change-Id: Ia4f100021e33aac65208eb2ef4c15ca0f1b7d5c4