This reverts commit 26efc37a3d. Reason for revert: Doesn't fix the issues in factory testing Change-Id: I8c8473f5a9c0cf9c53a95943101976d4b7103580
26efc37a3d