* resolves a SIGSEGV crash that causes the phone to lag Change-Id: I6094828c486c7a6aef2809e2ebf03e249a7bef49