This reverts commit 0fbeed22d4. Reason for revert: reverting this due to landing pixel scaling Change-Id: Idd0af2eaf5933b708e6a3831bf2f751c747a4f38 Bug: 335357341
0fbeed22d4