Add more nullability annotations

Fixes: 126702626
Fixes: 126702662
Test: compiles
Change-Id: I8639238c02b180eb2cf610a00111fd143bd59578
3 files changed