This permits leveraging future improvements to Thread. Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56