This reverts commit 1ec8d204. Reason for revert: verbose Bug: 232017677 Change-Id: Id33a85e5eba86c77c9bd060e64f0e484b2f8e6f5