Merge branch 'security-aosp-qt-release' into int/10/fp2

* security-aosp-qt-release:
  handle cases where order isn't a multiple of dimension

Change-Id: I510d8c9de2128978877335ab4999166b3f23e698