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

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

Change-Id: Ib5ab58df7a50ee111106f30554cba19ed4ce642a