This reverts commit 30651ca3. Reason for revert: broke some cts tests fixes: 276934137 fixes: 276924513 Change-Id: Ied3b64f21f1423d9275b7ecea06d46508c63a023