tree ba21cd39449aad9341f383d8a877cd4de72dce5f
parent f7578404ec2c0ae502b14626d819a7466f2273aa
author Denton Gentry <dgentry@google.com> 1422731242 -0800
committer Denton Gentry <dgentry@google.com> 1424639260 -0800

Merge backports 3.19-rc1.

Fix b/19040627 b/17790935 b/16350275

Change-Id: I7d1aa0cec743f88266e4f5a36f4839c3cc959e87