Revert "Remove skipped blocks reuse mechanism" am: e7d7e9dd01
am: 5a372f0356

Change-Id: I66b1ba21660425bad59145c9627a92c9e78120df