Merge "Clean up permissions when uids are no longer used" am: aa949eeae0 am: 26f1e2dbb1
am: 0bb39c6870

Change-Id: I7773132d11d6225eac91ab2fee1043159c295d83
tree: 6b124a13518ac4185b273785dae7366ecab72014
  1. core/
  2. services/
  3. tests/