Merge "Merge "Fix encryption/decryption of large blocks." into qt-dev am: 3074669a am: a533ef35" into qt-r1-dev-plus-aosp