[automerger skipped] Merge "Add Nullable/NonNull Annotations where appropriate." am: eb4d2067 am: 17b85fea
am: 23f61b5d -s ours
am skip reason: change_id I4cfba9dee766fa9d34f578db4143919c3f203a20 with SHA1 f8204f8d is in history
Change-Id: I3b92d0d2efb76ffbda76eec2de2bb5f58ad1abda