Merge "Move logic for handling uid observers outside AMS."