Temporary changes to fix crashes during tests.

Bug: 27852443
Change-Id: Ie61e628213281fc921e8de403d27ae1f941352e9
2 files changed