Merge "Remplace NetworkIdentity.OEM_* with NetworkTemplate.OEM_MANAGED_*"