Add NonNull/Nullable annotations

Change-Id: Id2a343765b29226a13ba41102df4bca739112192
Fix: 126701786
Test: Manual
2 files changed