[automerger skipped] Merge "Add missing nullability annotations."
am: 9b361c2674 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 00be951a08 is in history

Change-Id: I7b2712e4ab3635f94f8257d88f24c20bc68a3ac0