Merge "Suport variable blocksizes in dm-bow restore" am: 73c0028901
am: fdac3684c4

Change-Id: Id4c4aae860bc819d240864f3d60edf03a1c5e255