This reverts commit 5a9a3812. Reason for revert: fixes b/182729646 Fixes: 182729646 Change-Id: Idfa7fb9187a4707f4627a41b92f45313fbdc3ca8