Merge "[API Review] Replace usage of getUuids by new SystemApi"