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

Change-Id: Ida698956d8f771931fc546b91ef0e9717c3a1bdc