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

Change-Id: I8d0cfc9fcc228fa95a48fd6793058b4b57032571