Merge "Adjust instruction sets for shared UID apps."