[automerger skipped] Merge "Default to slot 0 when no subs for testing" am: 63df3cae19  -s ours am: a6284188ca  -s ours
am: 3575a717e1  -s ours

Change-Id: I135900f3cbef2ec727799f4e9251f9a0b7074b66