[automerger skipped] Merge "Fix incorrect API comments of getSubId()" am: 66a0899785 am: 5a75425936
am: 4ddb43ddf1  -s ours

Change-Id: I8409778d15e05840f61a47cb6c6cfae8c61e8c9a