Merge "Fix H404/405 violations for thirdparty and stress"