One fixes a NullAway warning reported on change
I32ba2b6b8c05c1379b4d921350050979b1866805, and the other is just nice
to have.
Bug: 245989146
Change-Id: I8a7ffbddf865bab317fdabf5110262bb0626c529
Test: TreeHugger
Flag: EXEMPT unable to flag this kind of change