25d5334a9d
This reverts commit 3e8a04b341.
Reason for revert: b/230862148
Change-Id: I7462e86643816f42fc72e40defffd58a1f77ee8b