am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] * commit 'ffbf2447': Remove @NonNull attribute [DO NOT MERGE]