There was some missing null checks. Bug: 16238192 (cherry picked from commit 2e290fb3) Change-Id: I4220272ac9c194e30fc307fca9918a4bb725e261