Merge backports 3.19-rc1.

Fix b/19040627 b/17790935 b/16350275

Change-Id: I7d1aa0cec743f88266e4f5a36f4839c3cc959e87
987 files changed