Revert "Further fixes for backports 3.19-rc1."

This reverts commit 7a037dff4306e34862daf80172978419c0208559
due to an inadvertent non-merge commit for the preceding backports
3.19-rc1.

Change-Id: Ic87ce5bc0c3cd86489f72458f473c8231a1ab2a6
2 files changed