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

Change-Id: I47bcdfe414ef646be36b2633d77697b6d9a71084