Merge "Add nullability annotations in accordance with the council" am: 049c43f088
am: 4a6dd7f3f0

Change-Id: I253a0adfd5dc6fc1d5a51bdcc2774b3e3da7f746