Merge "Record the UID of the app package instead of GID."