Merge "Rename PERSISTENT_NET_ID/TEMPORARY_NET_ID"