Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9f -s ours am: af533b33 am: e72a13d4 -s ours am: 4ad8ef14 am: bc9a8147 -s ours" into sc-dev