[automerger skipped] Merge "[SP25.1] Rename functions that add Entry...
[automerger skipped] Merge "[SP25.1] Rename functions that add Entry conditionally" am: 50f500bd am: bfc3282b -s ours
am skip reason: Change-Id I944844f9c28a3199a766df31faf9c8896c70eb56 with SHA-1 aec5554c is in history
Change-Id: I8d8db001cad16fd79f25690b935a18123f8d147a