Merge "Clean up permissions when uids are no longer used" am: 7754d368f4
am: ecb28c1948

Change-Id: I256ca6f16ea1fcd240a1b7cd2b3199d4504e6c33