Merge "API: Fix missing @NonNull annotations" am: b852f6636f
am: d1f5939c1a

Change-Id: I3d0ac8768dcc9c314e235dc679752dd5cbfde0c5