8b78849c44
This reverts commit febd61fb3f.
Reason for revert: b/323418145, testing to see if this is the culprit
Change-Id: Ie72ce0d24c6008e93340c1868b18bce68902c7cc