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

* dev/10/fp2/security-aosp-qt-release:
  Fix OPP comparison

Change-Id: I497be7bf80bcab85ac4d3d2b732219e57c562ebd