506565aaa0
This reverts commit 5859f7d62c.
Reason for revert: Most test devices have the platform changes
Change-Id: I86b61f07f873e0d231aaac322001065730436233