[PATCH 05/25] Updated CPE platform tags for