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

Change-Id: I08a1df6d6e9cee717a7cf0b8c9bfa59482fd312d