Sync with upstream trunk

  val: r14802
  vex: r3034

Change-Id: I699b8232b97ce103e105b011b462b60fea00d2b8
331 files changed