Merge to upstream r324282.

Test: make checkbuild
Change-Id: Ie634d45d9fe792e810d299b9c386a4ab316f0bd0