Merge "Prepare for enabling H302 rule (thirdparty)"