Merge "Add *AsUser() calls where appropriate for multi-user support." into nyc-dev