This reverts commit 5362448646. Reason for revert: Reverting this due to landing pixel scaling Change-Id: I4f9392d649cc927a24222207501f5191bd63c5a1 Bug: 335357341
5362448646