Merge branch 'security-aosp-pi-release' into int/p/fp2

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

Change-Id: Ib6975840ff59382e52bb2d46c1df3fcab9b8bbdb