Fixes more null pointer exceptions caused by ag/9382746

Test: tested locally
BUG:141940205
Change-Id: Icfccb560aa09555470da2303dead85e0ae4593ad
2 files changed