Merge "Add nullability anotations"
am: 7e3b406f26

Change-Id: I65423d6c48c93396dff54adf3f8c661ae2788686