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

Change-Id: Id6451f9cd18debf51137a81159ead79064fbafca