Revert "Revert "Correct ⭕ ⛶  🕳️ 👊👊👊👊👊👊""

This reverts commit 33226ec0e183b1162d18c0e02543db0fa31bcf45.

Reason for revert: Most test devices have the platform changes

Change-Id: Ic3f1c144537d127c690c7949f7144dedf0611c49
4 files changed