Merge "Only allow NR override network types on SA" into tm-dev