This reverts commit 28599c27ff. Reason for revert: Doesn't fix the issues in factory testing Change-Id: I7a46078fb68b61b608296c1a1c509dd5cedfd1e2
28599c27ff