0e25d2eba8
This reverts commit b1ef5e5c55.
Reason for revert: b/182382085#comment4
Change-Id: I001944da64dc05324b14cc9dd3db5921faf8806c
Bug: 182382085