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

Change-Id: Id1497dc86566c8dc8573f0692d58c1596854a0a5