am 8794b2ee: Merge "Fix perms on /data/security"

* commit '8794b2eeb2bbd717ca18b8bef5d853f99334aabc':
  Fix perms on /data/security