[automerger skipped] Merge "Remove slot ids from sSlotIndexToSubIds if they...
[automerger skipped] Merge "Remove slot ids from sSlotIndexToSubIds if they have the same sub id" am: 13c6cf87 am: e44fe6e8 -s ours
am skip reason: Change-Id I7a9bae338cdf97d5732dba51b50074529df97522 with SHA-1 b6d2cda3 is in history
Change-Id: I68471b879fc2c3b9a6b96b3144ab7570b1ef534f