Merge "Don't throw errors on sharedUid adjustment." into lmp-dev