[automerger skipped] Merge "API: Fix missing @NonNull annotations" am: b852f6636f am: d1f5939c1a
am: 5918a1cb6b -s ours
am skip reason: change_id Ia7589dfcc7f63923890e609dbf03175d2b035d29 with SHA1 918c4f1043 is in history

Change-Id: I7ea06e3270f84d3883113a8a1babfe1608e9c903