Remove skipped blocks reuse mechanism am: dbb57f3f8e
am: a89f81aa32

Change-Id: I7fefb4c32692b9a808c06edce3f255b357d31a1a