This reverts commit de72d339e5.
Reason for revert: Most test devices have the platform changes
Change-Id: Ibe7e22c5073f2405483945ac726e528bef88fbc9
This reverts commit de72d339e5.
Reason for revert: Most test devices have the platform changes
Change-Id: Ibe7e22c5073f2405483945ac726e528bef88fbc9