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

Change-Id: I6ad42a8e860ba7fce84f3f658a837f5cc4eab73d