This reverts commit dd9529050d. Reason for revert: There are at least b/315337725 and b/315036698 issues, reverting this cl while I fix them. Change-Id: I644bbbe594b9dd53a99a3b6513fbcba68afe0b4a
dd9529050d