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

Change-Id: I67db6398da083dede7f8a7993b52157fad190454