This reverts commit 59005120. Reason for revert: Causing other issues an cts failures Change-Id: I53b5a824ef751dd6764cd5780f253e3c599f9d51