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

Change-Id: I2af5416c9af0f0cda4110d1d9dc5ac8a9d880de1