[automerger skipped] Merge "Fixed that active sub ids are not sorted by slot...
[automerger skipped] Merge "Fixed that active sub ids are not sorted by slot index" am: ef96bb25 am: c926ab85
am: 2b9f182f -s ours
Change-Id: If898d90e598853eed379cd5c00cc11cc407fee46