Merge changes Ia2ca5790,I48b0a6d9 into main

* changes:
  [Mobile] Move from DATA_SPN to SPN for networkName
  [Mobile] Bugfix flag for SPN update