Merge "Revert "Add apex packages to uid_mapping"" into qt-dev