am 48718c85: Merge "Proper security labeling of multi-user data directories."

* commit '48718c85b41b785cf6f6ae72beb4c5d46559b735':
  Proper security labeling of multi-user data directories.