Merge "Define non gms and deprecate gms slot reservation constants" into pi-car-dev