This reverts commit 2c9b1043a6.
Reason for revert: Most test devices have the platform changes
Change-Id: I1e608395b186df3148562afa7c1d791e3c9e2eb5
This reverts commit 2c9b1043a6.
Reason for revert: Most test devices have the platform changes
Change-Id: I1e608395b186df3148562afa7c1d791e3c9e2eb5