am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on /data/security."

* commit 'fb39c0d19860fe48bc598d5d180a8cce9f59e33b':
  Fix mode on /data/security.