[mapping] Fixed mapping for removing CR, applying now just for current buffer

Change-Id: I85e16786f64e5d71d9126264d143b2ea493775a5