This reverts commit a0ee0608. Reason for revert: Cause cf devices cts tests failed Bug: 158836294 Change-Id: I5b439cf1aaee51f0c6d2e7e7e8d73487ec851648