Merge "Replace using integer with UserHandle for user id"