Adding workaround for crash.

Bug: 27815919
Change-Id: I04d70d16dd8b8281ba1ffbba056d475d834d5b54
2 files changed