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

Change-Id: I63742c9f263735b549b25aaae372d34ec82c8a18