Merge changes from topic "am-abce5681da074e3fa5a9a6b85cf6ce68"

* changes:
  [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
  Merge "API: Add missing nullability annotations" am: e148fbcf03 am: 336e11018e am: aaeb5c1201