Fix crash when started via Instrumentation.

Change-Id: Iffe2c76e93e67d56a239228fd2d9e6928ab9f65e
2 files changed