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