tree d57e2b92daf06747fbf7cfd494957cda6dd01710
parent 7aa79efe80b790eef61ac355c0ce6c7b606e6f78
author Soonil Nagarkar <sooniln@google.com> 1436551950 -0700
committer Soonil Nagarkar <sooniln@google.com> 1442857232 +0000

Fix reintroduction of b/10845061

Prevent crash in case where NLP is not available. Also fix an integer
overflow bug that remained uncaught.

BUG: 22345134
Change-Id: If6ff7b12f0d15bb2fe97589f8b0be10f9ed06197
(cherry picked from commit 2ec5c5cced4bd5b9dfbb7578f573c56b3bbc7ddf)