[automerger skipped] Merge "Mark StructNdOptPref64#prefix @NonNull." into rvc-dev am: 039d7960 -s ours am: 64344fae -s ours
am skip reason: Change-Id Ica4f6f7545e63e0665c2a4ae4de8323f3fd93e1c with SHA-1 5aa78eaf is in history
Change-Id: I3847f1158960b1cf896325af1ba0f61683015cc3