Merge "Remove NetworkUtils.queryUserAccess in test"