Also adds Nullable and NonNull annotations where it was obvious. Change-Id: I4be7a94b0510e87b260f902cc1efd3c5e4bdc228