[automerger skipped] Don't apply filter in readback, when there is no scaling am: cccd03859c  -s ours am: 9d8fe3b424  -s ours
am: 11315faa78  -s ours

Change-Id: Ibae586b5d0c79c8431514e147a354d649fc622b5