[automerger skipped] Merge "Mark StructNdOptPref64#prefix @NonNull." into rvc-dev am: 039d7960 am: 64ff01ee -s ours
am skip reason: Change-Id Ica4f6f7545e63e0665c2a4ae4de8323f3fd93e1c with SHA-1 1162d1cd is in history
Change-Id: Ib210f1c71056228d170e18c4f0dd7c29268d7375