Also mark the argument as @NonNull Bug: 126701378 Test: manually Change-Id: Ib2689b1f9932df88d8c62c3d82960874d992fb6f