Merge "Add @NonNull annotations to LE CoC APIs"