[automerger skipped] Merge "Add nullable and nonnull annotations" am: 6e7e6c5b5a am: bb2ad91ecb
am: 8d0b677ad7 -s ours
am skip reason: change_id I852fffebed9b63239a1f383ff4ad09f156fbb39d with SHA1 3a6f6858c5 is in history

Change-Id: I6425cbb0f697e9736a60e84ba196016959d5d28d