m7: remove old m7 props and split into different carrier variants

Change-Id: I0524c49ac7520847641708f1ccc79ca1af27a955