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

Change-Id: I99d90ab1cec914ccda4d0ef6eeb7b8ada76de133