Merge "Fix encryption/decryption of large blocks." into qt-dev
am: 3074669af7

Change-Id: Icede5f5af8c2c0d3216125b381ff7e7fd20a13cf