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

Change-Id: I7773132d11d6225eac91ab2fee1043159c295d83