Merge "Add @Nullable and @NonNull to onTransactStarted"