Merge "Don't error on block size mismatches." am: 10b0a155ee am: 0477883506
am: 84f7640eea

Change-Id: I088dacab2c835a5dc1e2a2e31c58a9fdac0eb762