Merge "Add nullability annotations" am: a1ee1fc888 am: 3d48153a8f
am: b141a800ac

Change-Id: I43088399da1d81556ab903ef1ca716439129f00d