Merge "Add nullability anotations" am: 7e3b406f26
am: 8123e5cc50

Change-Id: Id776e88e7669f78d845c77b80ad1d671efa08f71