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

* dev/10/fp2/security-aosp-qt-release:
  Check dir path before updating permissions.

Change-Id: I3d1cd0ed0c4cebf4ac7e733bebce07a0ad089a6e