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

Change-Id: I85a566c0eb25c73237c31b1f89975ed898a4f829