Merge to upstream r231075.

Change-Id: If60a5707fa4299ce03b7bfd605b360486bcd9d2f
79 files changed