This reverts commit 30711f8561. Reason for revert: b/217651561 Change-Id: I1647577ae5a7415ac336a5814fb0a73902c56aa7
30711f8561