Merge "[MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networks"