tree ca3c13ebcf1dc0e0ffdbc53242f316a20cfb0e46
parent b5cf247d1e23fbb63ef7e554cf6cf6b2ed69c4c4
author Dmitriy Ivanov <dimitry@google.com> 1418149242 -0800
committer Dmitriy Ivanov <dimitry@google.com> 1418149718 -0800

Sync with upstream trunk

  val: r14802
  vex: r3034

Change-Id: I699b8232b97ce103e105b011b462b60fea00d2b8