Update to upstream 6424881cc82a65a833fc6fb79730474caedf6222.

Test: treehugger
Change-Id: Ib11457ec6d166e774c9a053e23db4131c0030321
6 files changed