Merge "Default to slot 0 when no subs for testing" into pi-dev
am: 83ca6c57fc

Change-Id: I74fc1827a7abc7dcdc6bbc75ac4f92f050415b5b