Merge "Do not wait for opportunistic sub to be IN SERVICE for test emergency" am: ca1bf467d9
am: 7c55dc9d57

Change-Id: If7215dc87ffc0206a8a8d3daa0b794947d5482bc