This reverts commit 37083d05. Reason for revert: Breaks some display output Bug: 129945273 Merged-In: Ie0cdf9bd696ed4926fdd931d3c8a82fafd1a203f Change-Id: Ie0cdf9bd696ed4926fdd931d3c8a82fafd1a203f (cherry picked from commit 9055674c)