Also add some @NonNull and @Nullable annotations. Change-Id: Ia42b1af21ed14691b2268ea8b0f55d1b8b5ea2a3