Use zm05-zm08

Merge this after they exist.

Change-Id: I7187eb9e0c7cdeb72f0bc68157b00421c644e2fd