Merge "Remove the block size alignment restriction." am: b1f97f9d1b
am: 5704d3e22d

Change-Id: I16e26f02ca9fbf1f0be521284166b0fc886b37c5