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

* security-aosp-qt-release:
  Type confusion due to race condition on tag type change

Change-Id: I9caa906460bb52606d844e52a809a49e0e6792ec