Fix device tags on a few G3 buils

Change-Id: I808dd6861d4c3b54a2b4d972e37a93afc665ebb9