Merge "Replace non-existing http legacy in vogar"