tree ec2e167a764e45e94f03e9d4f5b3c9dff57bb426
parent 16059b32418215c4828fe98a0d90527d535c4fc9
author ajmichael <ajmichael@google.com> 1512576830 -0800
committer Copybara-Service <copybara-piper@google.com> 1512576959 -0800

Fix some broken targets and failing tests.

RELNOTES: None
PiperOrigin-RevId: 178099410