[automerger skipped] [SP24] Rename functions that add Entry unconditionally...
[automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 88f89a0f -s ours am: a43e2324 -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 fd661f5d is in history
Change-Id: Ib807d1cf6bf4c2a9be054bf5df7377f540201c63