Context: Fix nullability issues

Fixes: 126701488
Fixes: 126701488
Test: make checkapi
Change-Id: I9b61d833a68528f168611c83a8539eb095a42e01
3 files changed