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

Change-Id: I663bcb40b1b65598963a1818f68c248bb8b66d8a