Merge "Protect against non-ims connections when using D2D test commands." into sc-dev