Also add appropriate @NonNull and @Nullable annotations. Test: built Change-Id: I22de48105ef685baf594cfc004dd3e27e2ba09e9