Merge "Update atest configs for multi user test."