Merge "Part of fix for bug 5584571 Add HTTP request header with app name"