This reverts commit 82a67a1a2d. Reason for revert:b/317133692 Change-Id: Ibd66d2a113611380876c274d1c6203a7ab777a53
82a67a1a2d