Cherry pick gupc branch updates, up to version 226919.

From-SVN: r226922
3 files changed