313a44039f
This reverts commit 03815e6c79.
Reason for revert: b/271852893
Change-Id: I165a15b29e41ce1114f6b7d92d22cdd8e0dfb5b0
http://go/tapl