995478aee3
This reverts commit 33226ec0e1.
Reason for revert: Most test devices have the platform changes
Change-Id: Ic3f1c144537d127c690c7949f7144dedf0611c49