Merge "Remove plain HTTP endpoint 30281"