[automerger skipped] Merge "Make SLOT_INDEX invalid for all subs on...
[automerger skipped] Merge "Make SLOT_INDEX invalid for all subs on boot/process start." am: 234b0a54 am: 03d315c2 -s ours
am: 0a9084ba -s ours
am skip reason: change_id Icb73a5139bde7295c94345503ddb4f612f67efd9 with SHA1 bdc0a31c is in history
Change-Id: Ib89e18755cf17e5bdcabb98737d332d198d72a13