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

Change-Id: I1e50a956c5aa3d35bd403edc91a9adff3f05d627