a6f7ec3ba2
PR: 33179, 33181, 33295 Submitted by: Norihiro Kumagai <kumagai@attbi.com> Reviewed by: sheldonh (MAINTAINER) MFC after: 2 days