Merge to upstream r231075.

Change-Id: Ia0ecfc896b98dddbdc35180aa1f321836e5846ae