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

* security-aosp-qt-release:
  Move slice increments after completing header parsing

Change-Id: I04c0476d5a40c4f36656b3b4c4e7ffa9131f74bc