Merge "Change INTERACT_ACROSS_USERS_FULL to INTERACT_ACROSS_USERS"