tree 01ae76a8897de2f5550d6f55c93e4336795b5cb2
parent 5b1e4ee1cad020e471dd6d81abf6296b65d4db2f
author Marty Faltesek <mfaltesek@google.com> 1431035222 -0400
committer Marty Faltesek <mfaltesek@google.com> 1431051250 -0400

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