Merge to upstream r300419.

Test: make checkbuild
Bug: None